Revert a change which prevented torn-off menus from being shown normally.

2004-12-13  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkmenuitem.c (gtk_real_menu_item_select): Revert a change
	which prevented torn-off menus from being shown normally.

diff --git a/ChangeLog b/ChangeLog
index bfdd7dccbd5a0ba3741ca62dcd8df9074204cc22..ce929d11d264ddf2116408d268ea535898880485 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-12-13  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkmenuitem.c (gtk_real_menu_item_select): Revert a change
+       which prevented torn-off menus from being shown normally.
+
        * gtk/gtkmenu.c (gtk_menu_scroll): Implement scroll wheel scrolling
        for menus. (#88532)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bfdd7dccbd5a0ba3741ca62dcd8df9074204cc22..ce929d11d264ddf2116408d268ea535898880485 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2004-12-13  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkmenuitem.c (gtk_real_menu_item_select): Revert a change
+       which prevented torn-off menus from being shown normally.
+
        * gtk/gtkmenu.c (gtk_menu_scroll): Implement scroll wheel scrolling
        for menus. (#88532)
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index bfdd7dccbd5a0ba3741ca62dcd8df9074204cc22..ce929d11d264ddf2116408d268ea535898880485 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2004-12-13  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkmenuitem.c (gtk_real_menu_item_select): Revert a change
+       which prevented torn-off menus from being shown normally.
+
        * gtk/gtkmenu.c (gtk_menu_scroll): Implement scroll wheel scrolling
        for menus. (#88532)
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index bfdd7dccbd5a0ba3741ca62dcd8df9074204cc22..ce929d11d264ddf2116408d268ea535898880485 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2004-12-13  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkmenuitem.c (gtk_real_menu_item_select): Revert a change
+       which prevented torn-off menus from being shown normally.
+
        * gtk/gtkmenu.c (gtk_menu_scroll): Implement scroll wheel scrolling
        for menus. (#88532)
 

diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 9cff14b5c82975c96ed30d14e0387dd8f17e83fe..db2dbcbc3a2865a50fb22b8996d4f315c309641a 100644 (file)
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -838,8 +838,7 @@ gtk_real_menu_item_select (GtkItem *item)
 
   menu_item = GTK_MENU_ITEM (item);
 
-  if (menu_item->submenu &&
-      !GTK_WIDGET_MAPPED (menu_item->submenu))
+  if (menu_item->submenu)
     {
       gint popup_delay;